Fix readme

diff --git a/README.org b/README.org
index 5ece31c1457148e0c68e4e06150dbf310d8414bd..fa85454185a5f990897baa51d7ab1be8f4dcf8f6 100644 (file)
--- a/README.org
+++ b/README.org
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-[[http://melpa.org/packages/which-key-badge.svg]]
-* which-key 
-=======
 * which-key 
 [[http://melpa.org/#/which-key][http://melpa.org/packages/which-key-badge.svg]]
->>>>>>> master
 ** Introduction
 =which-key= is a minor mode for Emacs that displays the keybindings following your currently
 entered incomplete command (a prefix) in a popup. For example, after enabling the minor mode